Angela, this is my final change so you can put it on app engine.
final commit