Just fleshing out more of the structure