Made some recent changesand expanded view controllers.
Fixed merge conflict with Kelsey?