Moving more of the factoid commands to the actual class.