Added address and state models, still need to link them