rAKA/old-master

features/solver-rewrite