(refactor) Make Handler

Updated for newest Iron.