Tried adding a queue but it's ugly for now. Committing to pull to help
Jesse test.