Merging in initial code