Boilerplate shit
New Angular controller structure
New Angular controller structure -- merge fixed