bringing up to date again, ready to start merging new shipping code