almost there!
all merged up