Preliminary integration with solver

Note: does not work