Filled in more setup code.

Of course, the rest is the hard part