Checking in work in progress on grunt 4 rewrite
WIP
Got all basic tests to pass
Got original tests working in Grunt 4.0