constraints complete

Completed constraints. Testing to be done.