S000: Adding in some of the mess of files.
Merge pull request #2 from autowitch/working

S000: Adding in some of the mess of files.