Began adding MapGens, added pre-emptive fix