Removing TODO for implemented functionality