refactoring stuff
refactorign
refactorign
refactorign
refactorign
bug fixing
refactoring lots of stuff
refactoring
Merge remote-tracking branch 'origin/master' into ThreadingRefactorToAutoCleanupOnceComplete