3 tests passing. This feels messy....