Some progress in Solver (not ready yet)