Grunt test and cleanup
Temporary workaround for done/return issue
Cleanup, refactor, more testing
trying to get CI to work