Putting stuff back in I threw out before; making it pull-request-ready.