Refactored to use Angular views, final bit of spit & polish needed for release. Then onto next bit which is Resolvers, eg SurfaceControllers TreeControllers etc...