Added a whole buncha shit