Add arrowhead changes from master

PR after urgent Repo clean up
I also assume you will refactor the main Arrowhead to use the lib files?