merging hopefully complete