Split/add and fixes

This feels like a lot of generic work that might not catch all of the cases we need. What are your thoughts on being more specific in each method about what things should be stripped?