first pass

Change-Id: Ie750cf0aa7e6156ffa3239dc1f2136aa40e92787
Merge pull request #1 from notmyname/saio_update

first pass