Initial stab at merging