Adding the Sprint Start form
Misc clean_up and refactoring