modified controllers and daos, added new controller and data model