completed canonical logic portion of parse method.

UNFINISHED -still need to complete organization vs country logic when parsing abbreviated names.