WIP: Using new feature checks everywhere