Apply OOP submitting lab 05

Line these guys up. Hard to explain on GitHub but I can explain tomorrow.