Temporarily replacing scale factors with guessed forms
Merge branch 'master' of https://github.com/KaiSmith/Space-n-Stuff