Made some major changes.
STarted work on final UIs.
Moved solver into classes