WIP fix container save items