Shift in to own classes