Save map completed

Can now save maps.
Revert "Save map completed"

This reverts commit 2c2411c05263263f20aecafcfc648aa8cce1f668.
Revert "Revert "Save map completed""

This reverts commit 861fd113c043804b3be668b3f9a4b5c2e00ea91e.