DO NOT RUN, DO NOT EDIT

Added some things but also fixing others, do not edit ANYTHING until
I've finished :)