Added some constraints, tested things with source control.