For #23 A start to pull things into a common place.