Slight fleshing out, re-thinking of structure