rewrite started, 2 tests passing