Tom - first attempts at boundary checks for objects on the map