work some more
postage table functional added
conflict work merge