adding a bunch more stuff