Moved map_stuff to Map in Frameworks

Also made it compatible with the buffer ( i think )