Adding some more SW parts. 01/15/2013