The power of last minute panic

Things work now... mostly. We need to find those fringe cases, test this
thing out more.