Added populations and basic combat