Merge Wondergrid work into master branch

Meh - lets work on master branch!