5 - adding initial routing and refactoring retirement calculator service to work across different views
5 - fixing merge conflicts