Switched from class methods over to static function format.