Give us a default random
Refactor all the things -- map is an object now