Added a buncha shit