make a branch to discuss what our merged front end should like