Introduced some callback, loads of bugs...