Custom handlers

WIP. Appears my editor is fixing whitespace. Gotta clear that up.