Initial code commit
Resolve initial repo merge conflicts