Implementing party to queuing and changing some design of code