Rounds controller. Cleanup and add tests.