Add a bunch of new stuff and make my own