Screwed the merge of the new armour tool with the last commit.