before progressandgoal revamp.
ready to revamp the whole Exercises class....
Merge origin/master