Backing up incomplete changes
complete callbacks, specs, disable transaction for now
a wee refactor