Added a ton of stuff

please dont make this any more complicated than it has to be