Adding variables
Fixing conflicts
Addressing PR comments from #6255; breaking out project work into own files