Terrain

Have a look, if it seems ok, we should merge all them together.