more wip
mehant’s work on removing _MAP
updates to use latest optic stuff