Extended class work on final project