Backup commit, lots of stuff mostly work on active workouts