-new solver WIP