Closes #471, Closes #476, Closes #477, Closes #481
Co-authored-by: Karl Hudgell <karl.hudgell@bjss.com>