Class skeleton submission quick update. Incomplete.