Merging in initial work