Add transactions to speed things up?