initial code merge