Finish converting to Restangular