Fixes #585
Fixes #583. Will open a new ticket to address interface concerns for staff.