Still nothing really fixed... Kinda playing around with ways of tracking the objects in the map.  Some day I'll decide on an architecture! :p