add a bunch more stuff