More work on Terrain
Merged