OOPDS - Assignment 2