going to re-write queue