Fixing up semester code