Merge in some stuff