Updating OOP part 2, plus hw4 additions