Added OLL and PLL to Solver()