Apply OOP submitting lab 05

Extra