Add TODO
Re-bind instance methods