Second pass at refactor into class before conversion to Require.