Update for #30. New comment and new polls should work.