#6 #7 added address views and models