mostly functionaly. Still some issues with the map