Constraints

Re-issue pull request #56. Reverted changes to con2mo and restructured commits.