Up to feature testing

Making a local variable here makes it a lot easier to read I think!