This thing is in the new branch... and lets see what happens when I revert back to the master branch.