starting to set up angular hierarchy, but it's still busted (especially controllers.js)
unknown merge conflict in .pyc file