Update comments and plan remaining updates
Pull distance calculation out of controller and fix style bug on calendar
Merge branch 'develop'
"Separate controller logic"