Is this the right place to do this? Guess I should add a test for it.