Starting major overhaul of split operator code