Queue is now functional
Cleaned up some variables