Refactoring mapnificent.
Major Mapnificent refactor removing immutability..