All tests pass! Still need lots more, though