added bunch of new stuff woop