Composition Assignment, Take II

This is my second attempt for my assignment.