Working towards having the tests pass