Merge branches 'locking' and 'master' into locking
Discovered a potential bug in the switch case statements
Created an initial version of the Serial OCC
v1 of OCC appears to work superficially
Parallel OCC built up to Post-Validation
Getting stuck in an infinite loop
Unknown error in Parallel OCC
Unknown Seg Fault with P_OCC
P_OCC seems to be working
Preliminary tests of OCC
Remove debug changes from test file