Allow sub-community to be 2-digit-FOR based or cluster based. Minor refactoring. Flinders customisations.