Rolled back src to my last commit.

Rolled back src to my last commit. Going to go through commits and
re-add changes. Problem occurred due to poor communication. Latvian
believed we were making a clone of factions. We’re not.