fleshing the controllers, added user and devise