Stage1

Stage 1 is complete merging into master