Somewhat balanced waiting with new changes included
Merged/redid grassfield to "work" with updates

"work" = exist
Just changing so it will be easier merged with master