Begin implementing Factions
Minor tweaks