More work. Currently on constraint-adder