Partial commit of new cache based model
Merge branch 'master' into cached
Finished new implementation of solver
Code for timing solve algorithm
Time averaging