Possibly finished project 3rd try at merge