Removing TODO line. We've done it.