this works, holding my place
rps error handling for no entry and bad entry
Merge branch 'chore/Jun-12-fixes' into development