Major Clean up and the baselines of the faction system.