herp derp put it in the gen5+ branch where it might actually get run