warehouses working, need a few minor tweaks