@micheles @matley 
I will also point out that this is NOT new code. If you read the diff, you'll notice that it has only been moved (as a result of deleting a bunch of other code and rearranging things).