Merge branch 'JC_makegeneral' of https://github.com/tonic-team/Tonic-Research-Project-Template into JC_makegeneral