Dev

The basis_s_* functionality has not yet been tested.  Update includes basis_e_*