Many changes - record keeping

Wanted to have this iteration saved before many additional changes are
made