Wire up more stuff