Refactoring
Renamed tasks, several fields.
Also worked towards adding the update population code.