For those that get into this sort of stuff, I believe this is the latest proposed bill to be voted on. It was supposedly agreed upon last night and will be up for vote in the House and Senate.
I'm trying to read it. Admittedly, it makes my head hurt.
https://appropriations.house.gov/sit...DSUPP3_xml.pdf