we should hide this behind the waffle switch