merge stash
made the address stuff usable by suplier code
supplier have adresses. code feels wrong though