JMV branch initial

Jean had made changes outside of the repo. I am adding a branch to add
those changes. I will then merge that back in to the luminate branch