Maps stuff

Added more maps stuff.