First round of changes

The methodology stuff is still here. We'll have to create a new page
for it.