Yesterday I got over 12k steps total but didn't do any workouts.
Today, I just finished Day 23 of FBSweat which was a Cardio kickboxing/Upper body strength training routine with weights. I also did the extra credit routine, which was a 10 minute long abs workout. 43 minutes total, and I have a feeling my upper body will be sore tomorrow!