first commit
core locks not used outside of core anymore
Merge branch 'master' of https://github.com/karafmar/CAVE-demon