Added request queuing, small changes

This needs so much cleanup at this point it is crazy...