Tweaks
Added ability for simple callbacks
First passing version