Work on map saving
Rolled back to non-XML saving
Added implemention of save and load methods to enteties