Initial Solver spike
Need to re-think the approach
Need to re-think the approach
Rebuilding solver infrastructure