still more work on warehouse container stuff