Tasks 1-6
Modified the class structures