WIP. A bunch of more subtypes