Starting to refactor so I can use angular. Projects are currently broken.