added controllers, models, tests