Colin
Refactor to fix issues and use AngularJS correctly.