First half done - trying to satisfy constraints
Fixed constraints