OOP homework - Some updates