Added ability to pass in a callback
Merge branch 'feature/add-callback-handler' into develop