added Party and Contact and restructured the Order to handle Party instead of Address