Added controller, model, and some other jazz