Add additional fact support, and a TODO file ;>