Reintroduced all student's code with changes.  Working.