Added a bunch more stuff