Update 4

Ready for hand in (changes welcome)