entities - 1st cut of rejig to new code style.