Reorganizing with better locking
Propagation works but is kinda slow