WIP bag support

**WIP** DO NOT MERGE