Did the assignment

The main change is that I took the stub and completed the assignment.