Queue Finished, Need to write tests next