Clean up
Change grid building

More closely represent how it will be done with repa (I think).