New branch 2

Merging my detached head/sfx work back into the master branch