Finish Refactor to Terrain Generation