Added more pmap functionality, left tests broken on purpose