UML Inital merge. Please look at and amend

Addresses issue #6