Merge in initial work