Arrowhead

Refactored to a better design.