S000: Working on adit

Change-Id: If396fbc2947fe3adbdfddea0ffe7a523d1a01719