Hand-in version

This is a version I handed in to everyone on Jan 14th