Moved locations to SpaceObject instead of key field in Map
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>