Dominic: separate joink classes from octarine classes