Alikins/arch content 2

Not 100% ready for merge yet, but figured extra eyes (and bot tests) would help.