Solver Running

Still missing new functionality
Working Solver