Implemented queue features
fixing merge issues