Added remote queue feature but needs clean up