redoing primary stuff and retirement and committing
merge conflix