Finished work for tonight
Merge branch 'ChrisServerSmoothing' of https://github.com/brainteam/BrainSphere.git into ChrisServerSmoothing