In process of adding constraints properly with parsing them out and such
Merge branch 'master' into chase_constraints
Fixed Jarred's mistake for his package