WIP
WIP
WIP
Separated solvers
WIP
WIP
WIP
WIP