Seg fault error

Indexing errors were happening from this switch.  Unclear as to why but to address the symmetry and offset preservation this needs to continue to be looked at.