minor
working on basic constraints ... buggy
new unit tests
new unit tests
minor