trying to tie in the new preset system. Allows us to remove some code
and some tests.
docfix