Preliminary splitter containers

May need work, but functional so far