Some work on the close event stuff.