Added the LockExercise and some cleanup