+1 to implement this in a separate branch.