Minor work on step 2, will not build because errors in step2