adding in Address class, oops