Moving things around for Grunt
Got most of the app working