[#7] formatters fix
[#6] WIP on mappings, needs more thinking