Warehouse rewiring

Work in progress