beginning some simplification work
 merging