Building off #884, PRs #1011, #1044, @tim-moody's suggestions at PR https://github.com/iiab/iiab/pull/1061#issuecomment-417859271