Started merge of code.