map save process refactoring (in progress...)