Slight updates. Need to add ConditionLocks around connection calls.