committing before I re-work some of the angular controllers.