Added rudimentary handling of address information. Since we can't really parse