Inital commit, phase 1 is done