Fixed queue

Kinda crappy code
New schema