WIP: Cleaner Splitter interface