Added Solver Controller and added basic functionality for it. Not yet tested due to phase 3 still not working.
Merge