WIP: deduplicate models, reduce cyclomatic complexity, change display of additional info on site card.