Made some massive changes
Merge branch 'master' of https://github.com/bfox1/SAO into Chris
Don't know what else is here. Check for youself.