Hello, I need some help with a ArgoUML assignment. The assignment was originally a UML diagram of a fleet of cars. Each week, we make changes and add something. This week we have to add aggregation, cardinality, and composition. I started doing it but am unsure if what I have so far is correct? Also, will I need aggregation or composition between vehicles and the vehicle types?

I’ve attached the diagram from before I did anything and then with the aggregation I added. 

Thanks for any help!