Finished refactoring queue controller, added full queue functionality