First stab at arrowhead refactoring