Add more complex pregenerated maps

And optimize loading of them so they don't take forever and a day to
load