Incomplete grid implementation
Merge branch 'master' into grid
Completed implementation of "grid" start arrangement.