Finished setting up MVC abstractions