A first pass at merging things together...