More TODO stuff - methods as callbacks in examples.