pre-refactoring
update tests, clean up
Merge branch 'templates-cache-class'
update tests, remove constructor junk
Merge branch 'return-value'
locals. options. sorted. done.
Merge branch 'options-locals'
remove test file
move tests
clean up, run verb