Nit: # TODO(Brady):

I'm trying to follow this style guide: https://google-styleguide.googlecode.com/svn/trunk/pyguide.html