If you want I can make a commit for that last so you can see what it would look like...