work on controllers and set up basic views
merged changes from views