Modeled the funnel and plug in fusion360. Used some stuff from grabcad.com for the thread parts because I didn't want to figure out how to do it manually. I'd upload the files directly, but they're too large for the site. Below are thingiverse links. https://www.thingiverse.com/thing:4839843 (funnel) https://www.thingiverse.com/thing:4839848 (plug) I added o-ring seats, used this o-ring from mcmaster: 9452K58 as It was the closest to what my fittings have. Also added the .step files to the links above and left the older versions there just in-case. Thanks Cheapskate!