Series of changes to improve performance on larger problems. Need to test with...

Series of changes to improve performance on larger problems. Need to test with alternate partitioning methods at it supposedly introduces circular dependencies