Begin Rework of Solve Mechanic