Feature flags really needs finishing up...