Issue #16: add container + CS