Get bundle saving and loading working