Added @todo commit for how we want to handle class assignment based off status