S000: Adding mo' stuff

Change-Id: I7c83c19584bbf8a536705c193d1fdf73b8bc2309
Merge pull request #5 from autowitch/dev

S000: Adding mo' stuff