Update solving to add extra data
Update view
Add exact solve