Design update - Class definitions, top-down design