Did initial implementation of queue stuff