Shift most of main out in to simulation file, will separate out others soon
Removed computeG
Needs reverting
Revert "Needs reverting"

This reverts commit 55b88de83bc0392b31cd812fc65125831d322ad9.
Merge branch 'V2.7'
Test
Merge branch 'V2.7'