MOTM-874: Adds the stuff the previous PR removed... lame