If we use transactions, then we need to remember to commit them!
With this fix, the new logic is starting to come to life - though
at present, it creates duplicate entries.

We might also be able to do without transactions anyway...