WIP splotch refactoring