#578 working on shipping addons