Merged
Fix whitespace, and note that we need rendered fields
Naming, and start working toward rendering fields with values
Cruft
Naming