things are working but a map would be awesome