Passes current test cases, fleshed out todo