Poll refactoring
Form object dev version