WIP: Almost ready to write the test I want