added a solver that pretty much works\!
added stuff