Everything but SFX done.
Merge pull request #2 from LewisWakeford/master

Everything but SFX done.