back and forth to map mostly works

Signed-off-by: Jeff Wells <jeff@coderbase.io>