code review 7/10 - do not merge

- I left comments in the code
- Let's ++ test coverage!