New map generator.  It's not perfect but it's alright.