Commented out half-finished deadlock detection; re-partitioning passes basic concurrent test