moved address into its own model