ENH: More work on minerva refactor.