refactored to OOP and can now do re-solvings