Partially implement maps, and other stuff I don't remember, woo!