FASHN - big refactor of SR thesis, add in many fields missing from display