For those keeping score at home: https://timeanddate.com/s/38w6

The current stopgap bill may yet be pulled. Why, you might ask? See:

Senate Dems block quick vote on short-term spending bill - FederalNewsRadio.com https://federalnewsradio.com/government-shutdown/2017/04/white-house-backs-off-as-lawmakers-work-to-avert-shutdown/

All this discussion by the news media of introduction of bills, intentions to act, and the like are pretty much useless. Until any bill has passed both houses in the same form, has been presented to the President, and has been signed by the President it is not law. Article I, Section 9, Clause 7 requires appropriations to be made by law. Current law says appropriations run out at 11:59:59 PM on Friday night. Regardless of anybody having good intentions...show me the signed law. Until then, don't tell me it is fixed. Nothing is fixed yet.