Some notes about code not belonging in core + temp fix
Pulling old poll layout - this will probably be removed and refactored