oops, had not saved some files. This is final commit after hand-in, presentation iminent