Assignment finished

The final version of the assignment