Added backfill and random generation of terrain
Merge with master