More work on the new terrain (WIP)