Working arrowheads

The arrowheads work, but please test them