S000: Working on adit

Change-Id: I52d0ae912c068e37b501e71700030f5cacc5964d