Key sfx

I'm going to start working on merging Jay's work with a copy of master