Implemented Container to some degree.
Removed stupid header
Merge branch 'container'