big refactoring to be angular-er.  things are broken.