tmp working on some more MAP types