cleaned up some TODOs -- all tests passing!