Filling in a bunch more stuff to make the first e2e tests do stuff