Merge
Fuck race conditions
FUCK GIT