first commit of companion solver
FIrst shot at companion compiles