merge
fleshing it out a bit more