Revert "Revert "Pre-changes to CargoBay""

This reverts commit e7a6a51b9669efbd75c960aee9f6394912f40d42.
Revert "Revert "Will be reverted""

This reverts commit 23140abcd549e39731703d72ec2c76aa79a8bf72.