Test m1 build - milestone1 code changes for review

milestone1 code changes for review to know whether we are going in the right direction.