Added address parsing, now need sufficient test set