Re-factored to use externalised settings goodies library