- split off mappers?

- tests

- more examples
