merge stager
cleaning and getting the timeout working