Cleaned up queuing logic even though system doesn't to do well on huge data