More DB changes. Sorting through how to implement this.