working on the front end
fixing merge conflicts