Tristan Homework 2

Ready for consideration.