Fleshing out basic classes