WP-2879 Splitting out into a separate file from the .module file.