major restructure to use better model and service pattern, works but have yet to move functions to models; upgrade restangular