WIP Updates to grunt and continued refactoring work