working on views aaand controllers
Getting ready to merge things
Pulling in merge from master on github