working
conflicts
queue working - slow cooldown?
benjis changes