Filling in controllers and models, more TODO