Massive commit; major update to shipping app; preparing to split the shipping app out onto its own