(Hopefully) Merging SolarisFox's Work

If I did it right; I can’t work out GitHub when it’s manual. e-e