Move queue back into main, was breaking go get