Added official factions, ready for guv'ner merge