Merging Jonathan's code
Added ArrowAnimaiton class and commented out the explicit 'fill' lines.