More refactoring and continuing to add support for exercise calculation