Still need to restructure to use ng-view and route.  But claned up some.