Did lots of stuff with Angular and factories
cleanup