#2197 -> tweaks to what I've already done. Started settings field arrays.