More work done on the facts module.