Finished Solver

Working on testing now