Bunch of major updates

Added Queue
Modified Structure