Fleshing out basic structure