Seperate component solver

Might also have some unrelated changes

Merge request reports

Loading