Issue 429 - We're going on an arrow function hunt.. (26)