More fleshing out of the classes