Refactor solver to near completion. Push to debug.