Moderate refactoring, stub out Poll app
Resolve merge conflict