Started merging the rest