Issue #15. WIP, first test passes.