Added the states and split up addresses and stuff