All of this will be deleted before we go to master. So far we are split 2/2 on which approach to take.