Use queue for certain classes

@chaslemley 
The solution is not ideal here and please let me know if you can think of another way to do this.