Mostly just the piping though, so the code shouldn’t be as fragile now.