Merging the two together...slowly