Fixes #99. Map loads in under two minutes. It's not perfect in terms of speed but it's much, much quicker.