Added rest of splitter stuff