Fixing competitive raises
Remove files
Merge branch 'newmodules' into jeff-norman
Merge