Big refactoring, handlers now use Procs