UML Inital merge. Please look at and amend