Arrowhead/mohammad v1

Several changes in this pull request - please excuse all except the arrowhead refactor.
Incorrect indentation detected (column 0 instead of 2).