Implemented callbacks
Added test for the callback stuff
Not quite working yet...
Added a few more tests