Thanks for that Cindy. I merged with your GPII-226 branch and moved your work a bit forward by one commit. It does some work on harmonizing the UIO model with the GPII expected data. This is done in commit https://github.com/chrispetsos/prefsEditors/commit/37ea6a175ea5410dba577f454a831b9a2f93f962. You can pull that and go on with that.