Added in a bunch of bits from archer to remove intermediate arch install need