First pass at a deamortized map
Switch to AA trees for deamortized map