Container

Added container functionality. Fixed some bugs. Demo added.