semi finished

needs to match previous map
needs comments