Halfway through adding constraints -- still broken
Finished adding 2x2 constraints