Beginning to merge code