New menus hidden behind feature flag

We wanted the other class, right?