ConstraintSolver datatypes WIP