Gonna move to a new branch
Fixed the dark and evil merge conflicts
spinlocks seems to work, might need more tests
first merge with atomic
second merge with atomic