in-progress commit. My session crashed at work so these files are mid thought.