initial work complete
merged