Adding in more locking
Starting real work on the locking
Fixing the locking
Fixing locking conflicts