cleanup
make callbacks fail

w/ tests
version 1!