Adding internal support for maps, Circumcircle map
Basic functionality for maps works, move mode works