Refactored the controller, fleshed out the tests. Won't actually work yet.