Once you add in the new Factory for the LockContainers, I would be happy to merge this in.