Class that was accidentally omitted from previous commit...!