another intermediate commit
add 2 test headers
add tests (they fail)
getting closer to a solution