Start adding merge functionality

More to come soon.