Sounds good, Susan, although I would caution that the second item may not be straightforward and should obviously be a separate ticket. @ramiro tried to covert the COOKIE settings into a dictionary and ran into some issues. see https://code.djangoproject.com/ticket/21051 for details.