Finished CombineLikeTerms
Now to debug the solver