Add yet more stuff.

Conflicts:

	foo

Conflicts:

	foo