wip: a beginning of the new constraint solver