Yeah that would work actually. Maybe behind a flag