Temp improvement on not having to generate 271GB of output
Now with the formulae properly implemented!
Now with checked formulae, moved some code, and renamed stuff