Starts to breakdown large methods in Solver