OK Justin, I'll create a post-pilots branch and leave the commented code there only.