mostly working maps now