Committed a working version of prof's code: callbacks work, just run make all and test