Begun implementing new (untested) queue system