WIP: Refactoring Facts.