adding last stuff for the day, still working on Solver