Custom Handlers

Still needs thorough tests, maybe a few refactors here and there.