Arrowhead

Initial attempt at fixing arrowhead file,
please review
not nuts about the method name. Is this a validator? A lookup? "handler" is so generic.