Preliminary integration with solver

Note: does not work
Merge pull request #8 from BLesnau/solver_integration

Preliminary integration with solver