Get rid of callback-a-callback mess

Closes #5