Cleaning up to prepare for Portal 2 only work
Changed to angularjs