(WIP) New concept for defining container

Remove the global state from the declaration.