fleshing stuff out
merging