Updated for speed
Return new assignemnts and data structures
Updated to run full analysis with tic-toc design