William's branch 1

Adding my portion to the master