finishing up basics of the new design