Initial merge of code