initial steps on UI
reconciled merge conflicts