refactor
stuf
renamed #on callbacks
Merge pull request #1 from colinmacdonald/colinmacdonald/todo-refactor

Colinmacdonald/todo refactor