Finished controllers and tests for controllers... that was interesting