Split up code, to avoid spaghettification
Merge branch 'master' of github.com:Spacecow-Gaming/Planetary