add error msgs; add start of design
fix merge