Added more Factions support, started refactoring things.