first installment of the design
addressing conflicts