Container and Infinite container additions

- [x] @Aintaer