Issue 34

CCBexley issue 34

Issue 34 April 2023