Begin adding queue funcitonality and other usability improovements