More content, less spaghetti

Updated a vast majority of the code to run better and be easier to work with. Also adds some new content because why not.