Updating to include a little bit more on OO programming.