Slight restructure, added queues.