Adding in AddressModel for move to MVC pattern