the way these helpers are added feel kinda jankey, we should likely refine this/