Refactor, refactor... nicer prints, options are passed to solver...