Making handlers smarter, applying them where appropriate.
cleanup
making handlers better.