AFishyFez's Pull Request Boogaloo

Well I'm no good at naming these.