S9999: Mo' stuff

Change-Id: I2c6ab8a8728aab787c8ca35d31040220bee77edf
S9999: Adding basement

Change-Id: Ied5ca0b5fe603ecf0988eafceb79c903ba4b2466
Merge pull request #4 from autowitch/working

Working