Factories now pass down the lock. Need to have them use it.
Transaction support complete.
Removing two files added accidentally.