Improve solver seperation.
Changed solver to produce json keys.
Fix bug in solver.
Solution display improvements.