I'm subscribed to that issue :+1: can't wait. 
After looking over the rest of the code I realize that you're just keeping it consistent.