In Progress

Solver update