final design commit for first iteration