Added phase 1 code to build from