Here's the new commit for the working new branch called toby_branch