diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..002da1d
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Main.java
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 84b02df..bf7c296 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$/BreakingNews" />
-        <option name="gradleHome" value="D:/Software 2023/Gradle/gradle-8.12.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$/BreakingNews" />
diff --git a/.idea/libraries/Gradle__org_json_json_20210307.xml b/.idea/libraries/Gradle__org_json_json_20210307.xml
new file mode 100644
index 0000000..7d7520b
--- /dev/null
+++ b/.idea/libraries/Gradle__org_json_json_20210307.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="Gradle: org.json:json:20210307" type="java-imported" external-system-id="GRADLE">
+    <properties groupId="org.json" artifactId="json" version="20210307" baseVersion="20210307" />
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20210307/528c8df3757e8bcf151817b1d7b9b434f6aa08d5/json-20210307.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules/BreakingNews.main.iml b/.idea/modules/BreakingNews.main.iml
index a14c1f3..27fa147 100644
--- a/.idea/modules/BreakingNews.main.iml
+++ b/.idea/modules/BreakingNews.main.iml
@@ -7,7 +7,8 @@
       <sourceFolder url="file://$MODULE_DIR$/../../BreakingNews/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../BreakingNews/src/main/resources" type="java-resource" />
     </content>
-    <orderEntry type="jdk" jdkName="23" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: org.json:json:20210307" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/BreakingNews.test.iml b/.idea/modules/BreakingNews.test.iml
index 26c978a..2369903 100644
--- a/.idea/modules/BreakingNews.test.iml
+++ b/.idea/modules/BreakingNews.test.iml
@@ -7,9 +7,10 @@
       <sourceFolder url="file://$MODULE_DIR$/../../BreakingNews/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../BreakingNews/src/test/resources" type="java-test-resource" />
     </content>
-    <orderEntry type="jdk" jdkName="23" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="BreakingNews.main" />
+    <orderEntry type="library" name="Gradle: org.json:json:20210307" level="project" />
     <orderEntry type="library" name="Gradle: org.junit.jupiter:junit-jupiter:5.9.1" level="project" />
     <orderEntry type="library" name="Gradle: org.junit.jupiter:junit-jupiter-params:5.9.1" level="project" />
     <orderEntry type="library" name="Gradle: org.junit.jupiter:junit-jupiter-api:5.9.1" level="project" />
diff --git a/BreakingNews.iml b/BreakingNews.iml
index 487e0e4..eeda16e 100644
--- a/BreakingNews.iml
+++ b/BreakingNews.iml
@@ -6,7 +6,7 @@
       <excludeFolder url="file://$MODULE_DIR$/BreakingNews/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/BreakingNews/build" />
     </content>
-    <orderEntry type="jdk" jdkName="23" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/BreakingNews/.gradle/8.13/checksums/checksums.lock b/BreakingNews/.gradle/8.13/checksums/checksums.lock
new file mode 100644
index 0000000..549cc93
Binary files /dev/null and b/BreakingNews/.gradle/8.13/checksums/checksums.lock differ
diff --git a/BreakingNews/.gradle/8.13/checksums/md5-checksums.bin b/BreakingNews/.gradle/8.13/checksums/md5-checksums.bin
new file mode 100644
index 0000000..13a7e1d
Binary files /dev/null and b/BreakingNews/.gradle/8.13/checksums/md5-checksums.bin differ
diff --git a/BreakingNews/.gradle/8.13/checksums/sha1-checksums.bin b/BreakingNews/.gradle/8.13/checksums/sha1-checksums.bin
new file mode 100644
index 0000000..f2ae626
Binary files /dev/null and b/BreakingNews/.gradle/8.13/checksums/sha1-checksums.bin differ
diff --git a/BreakingNews/.gradle/8.13/executionHistory/executionHistory.bin b/BreakingNews/.gradle/8.13/executionHistory/executionHistory.bin
new file mode 100644
index 0000000..5fab994
Binary files /dev/null and b/BreakingNews/.gradle/8.13/executionHistory/executionHistory.bin differ
diff --git a/BreakingNews/.gradle/8.13/executionHistory/executionHistory.lock b/BreakingNews/.gradle/8.13/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..00796c4
Binary files /dev/null and b/BreakingNews/.gradle/8.13/executionHistory/executionHistory.lock differ
diff --git a/BreakingNews/.gradle/8.13/fileChanges/last-build.bin b/BreakingNews/.gradle/8.13/fileChanges/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/BreakingNews/.gradle/8.13/fileChanges/last-build.bin differ
diff --git a/BreakingNews/.gradle/8.13/fileHashes/fileHashes.bin b/BreakingNews/.gradle/8.13/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..d58f80d
Binary files /dev/null and b/BreakingNews/.gradle/8.13/fileHashes/fileHashes.bin differ
diff --git a/BreakingNews/.gradle/8.13/fileHashes/fileHashes.lock b/BreakingNews/.gradle/8.13/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..4ced6c7
Binary files /dev/null and b/BreakingNews/.gradle/8.13/fileHashes/fileHashes.lock differ
diff --git a/BreakingNews/.gradle/8.13/fileHashes/resourceHashesCache.bin b/BreakingNews/.gradle/8.13/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000..6b3c5f8
Binary files /dev/null and b/BreakingNews/.gradle/8.13/fileHashes/resourceHashesCache.bin differ
diff --git a/BreakingNews/.gradle/8.13/gc.properties b/BreakingNews/.gradle/8.13/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/BreakingNews/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/BreakingNews/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 7fb0b08..baa2224 100644
Binary files a/BreakingNews/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/BreakingNews/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/BreakingNews/.gradle/buildOutputCleanup/cache.properties b/BreakingNews/.gradle/buildOutputCleanup/cache.properties
index 7aea9a3..284db0b 100644
--- a/BreakingNews/.gradle/buildOutputCleanup/cache.properties
+++ b/BreakingNews/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Sat Mar 01 16:55:21 GMT+03:30 2025
-gradle.version=8.12.1
+#Fri Mar 14 19:54:33 GMT+03:30 2025
+gradle.version=8.13
diff --git a/BreakingNews/.gradle/buildOutputCleanup/outputFiles.bin b/BreakingNews/.gradle/buildOutputCleanup/outputFiles.bin
index d80c6b9..3d73326 100644
Binary files a/BreakingNews/.gradle/buildOutputCleanup/outputFiles.bin and b/BreakingNews/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/BreakingNews/.gradle/file-system.probe b/BreakingNews/.gradle/file-system.probe
index 06b60db..ddc637a 100644
Binary files a/BreakingNews/.gradle/file-system.probe and b/BreakingNews/.gradle/file-system.probe differ
diff --git a/BreakingNews/build.gradle b/BreakingNews/build.gradle
index ef49406..794e22c 100644
--- a/BreakingNews/build.gradle
+++ b/BreakingNews/build.gradle
@@ -12,6 +12,7 @@ repositories {
 dependencies {
     testImplementation platform('org.junit:junit-bom:5.9.1')
     testImplementation 'org.junit.jupiter:junit-jupiter'
+    implementation 'org.json:json:20210307'
 }
 
 test {
diff --git a/BreakingNews/build/classes/java/main/AP/Infrastructure$1.class b/BreakingNews/build/classes/java/main/AP/Infrastructure$1.class
new file mode 100644
index 0000000..f37b584
Binary files /dev/null and b/BreakingNews/build/classes/java/main/AP/Infrastructure$1.class differ
diff --git a/BreakingNews/build/classes/java/main/AP/Infrastructure.class b/BreakingNews/build/classes/java/main/AP/Infrastructure.class
new file mode 100644
index 0000000..0968537
Binary files /dev/null and b/BreakingNews/build/classes/java/main/AP/Infrastructure.class differ
diff --git a/BreakingNews/build/classes/java/main/AP/Main.class b/BreakingNews/build/classes/java/main/AP/Main.class
index 9bdff65..7fa2a4e 100644
Binary files a/BreakingNews/build/classes/java/main/AP/Main.class and b/BreakingNews/build/classes/java/main/AP/Main.class differ
diff --git a/BreakingNews/build/classes/java/main/AP/News.class b/BreakingNews/build/classes/java/main/AP/News.class
new file mode 100644
index 0000000..2708fac
Binary files /dev/null and b/BreakingNews/build/classes/java/main/AP/News.class differ
diff --git a/BreakingNews/build/libs/BreakingNews-1.0-SNAPSHOT.jar b/BreakingNews/build/libs/BreakingNews-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..3c4cbe7
Binary files /dev/null and b/BreakingNews/build/libs/BreakingNews-1.0-SNAPSHOT.jar differ
diff --git a/BreakingNews/build/tmp/compileJava/previous-compilation-data.bin b/BreakingNews/build/tmp/compileJava/previous-compilation-data.bin
index 820d55a..1be790f 100644
Binary files a/BreakingNews/build/tmp/compileJava/previous-compilation-data.bin and b/BreakingNews/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/BreakingNews/build/tmp/jar/MANIFEST.MF b/BreakingNews/build/tmp/jar/MANIFEST.MF
new file mode 100644
index 0000000..58630c0
--- /dev/null
+++ b/BreakingNews/build/tmp/jar/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
diff --git a/BreakingNews/gradle/wrapper/gradle-wrapper.jar b/BreakingNews/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..9bbc975
Binary files /dev/null and b/BreakingNews/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/BreakingNews/gradle/wrapper/gradle-wrapper.properties b/BreakingNews/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..37f853b
--- /dev/null
+++ b/BreakingNews/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/BreakingNews/gradlew b/BreakingNews/gradlew
new file mode 100755
index 0000000..faf9300
--- /dev/null
+++ b/BreakingNews/gradlew
@@ -0,0 +1,251 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/BreakingNews/gradlew.bat b/BreakingNews/gradlew.bat
new file mode 100644
index 0000000..9b42019
--- /dev/null
+++ b/BreakingNews/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/BreakingNews/src/main/java/AP/Infrastructure.java b/BreakingNews/src/main/java/AP/Infrastructure.java
index 84d4e6f..c7b326b 100644
--- a/BreakingNews/src/main/java/AP/Infrastructure.java
+++ b/BreakingNews/src/main/java/AP/Infrastructure.java
@@ -1,34 +1,48 @@
 package AP;
 
+import java.time.LocalDate;
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.Scanner;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 public class Infrastructure {
 
     private final String URL;
     private final String APIKEY;
     private final String JSONRESULT;
-    private ArrayList<News> newsList; // TODO: Create the News class
-
+    private ArrayList<News> newsList;
+    private ArrayList<News> favoriteArticles = new ArrayList<>();
 
     public Infrastructure(String APIKEY) {
         this.APIKEY = APIKEY;
-        this.URL = "https://newsapi.org/v2/everything?q=tesla&from=2025-02-05&sortBy=publishedAt&apiKey=";
+        // Build the URL with yesterday's date for filtering articles
+        this.URL = "https://newsapi.org/v2/everything?q=tesla&from=" + LocalDate.now().minusDays(1) + "&sortBy=publishedAt&apiKey=";
         this.JSONRESULT = getInformation();
+        if (JSONRESULT != null) {
+            parseInformation();
+        } else {
+            newsList = new ArrayList<>();
+        }
     }
 
     public ArrayList<News> getNewsList() {
         return newsList;
     }
 
+    /**
+     * Retrieves the JSON result from the API.
+     */
     private String getInformation() {
         try {
             HttpClient client = HttpClient.newHttpClient();
-
             HttpRequest request = HttpRequest.newBuilder()
                     .uri(URI.create(URL + APIKEY))
                     .build();
@@ -45,16 +59,195 @@ private String getInformation() {
         return null;
     }
 
+    /**
+     * Parses the JSON result to extract the first 20 articles and map them to News objects.
+     */
     private void parseInformation() {
-        // TODO: Get the first 20 news from the articles array of the json result
-        //  and parse the information of each on of them to be mapped to News class
-        //  finally add them to newsList in this class to display them in the output
+        newsList = new ArrayList<>();
+        try {
+            JSONObject jsonObj = new JSONObject(JSONRESULT);
+            JSONArray articles = jsonObj.getJSONArray("articles");
+            int count = Math.min(articles.length(), 20);
+            for (int i = 0; i < count; i++) {
+                JSONObject article = articles.getJSONObject(i);
+                String title = article.optString("title");
+                String description = article.optString("description");
+                String sourceName = "";
+                if(article.has("source")) {
+                    JSONObject source = article.getJSONObject("source");
+                    sourceName = source.optString("name");
+                }
+                String author = article.optString("author");
+                String url = article.optString("url");
+                String publishedAtStr = article.optString("publishedAt");
+                Date publishedAt;
+                try {
+                    publishedAt = Date.from(java.time.Instant.parse(publishedAtStr));
+                } catch(Exception e) {
+                    publishedAt = new Date();
+                }
+                News news = new News(title, description, sourceName, author, url, publishedAt);
+                newsList.add(news);
+            }
+        } catch(Exception e) {
+            System.out.println("Error parsing JSON: " + e.getMessage());
+        }
     }
 
+    /**
+     * Displays the list of news titles as a menu so that the user can choose one to view details.
+     * Additional options include saving favorite articles and changing the publish date format.
+     */
     public void displayNewsList() {
-        // TODO: Display titles of the news you got from api
-        //  and print them in a way that user can choose one
-        //  to see the full information of the news
+        if (newsList == null || newsList.isEmpty()) {
+            System.out.println("No news available.");
+            return;
+        }
+        Scanner scanner = new Scanner(System.in);
+        while(true) {
+            System.out.println("\n=== News List ===");
+            for (int i = 0; i < newsList.size(); i++) {
+                System.out.println((i + 1) + ". " + newsList.get(i).getTitle());
+            }
+            System.out.println("F. View Favorite Articles");
+            System.out.println("G. Open GUI");
+            System.out.println("E. Exit");
+            System.out.print("Select an article number to view details, or choose an option: ");
+            String input = scanner.nextLine();
+            if(input.equalsIgnoreCase("E")) {
+                System.out.println("Exiting News List.");
+                break;
+            } else if(input.equalsIgnoreCase("F")) {
+                displayFavoriteArticles();
+            } else if(input.equalsIgnoreCase("G")) {
+                launchGUI();
+            } else {
+                try {
+                    int index = Integer.parseInt(input) - 1;
+                    if (index >= 0 && index < newsList.size()) {
+                        News selectedNews = newsList.get(index);
+                        selectedNews.displayNews();
+                        System.out.println("\nOptions:");
+                        System.out.println("1. Save to Favorite Articles");
+                        System.out.println("2. Change Publish Date Format");
+                        System.out.println("0. Back to News List");
+                        System.out.print("Select an option: ");
+                        String option = scanner.nextLine();
+                        if (option.equals("1")) {
+                            saveFavoriteArticle(selectedNews);
+                        } else if (option.equals("2")) {
+                            System.out.print("Enter new date format (e.g., yyyy-MM-dd): ");
+                            String format = scanner.nextLine();
+                            System.out.println("Formatted Date: " + selectedNews.getFormattedPublishedAt(format));
+                        }
+                    } else {
+                        System.out.println("Invalid selection.");
+                    }
+                } catch(NumberFormatException e) {
+                    System.out.println("Invalid input.");
+                }
+            }
+        }
+    }
+
+    /**
+     * Saves a news article to the favorites list if it is not already saved.
+     */
+    private void saveFavoriteArticle(News news) {
+        if (!favoriteArticles.contains(news)) {
+            favoriteArticles.add(news);
+            System.out.println("Article saved to favorites.");
+        } else {
+            System.out.println("Article is already in favorites.");
+        }
     }
 
+    /**
+     * Displays the list of favorite articles.
+     */
+    public void displayFavoriteArticles() {
+        if (favoriteArticles.isEmpty()) {
+            System.out.println("No favorite articles.");
+        } else {
+            System.out.println("\n=== Favorite Articles ===");
+            for (News news : favoriteArticles) {
+                System.out.println(news.getTitle());
+            }
+        }
+    }
+
+    /**
+     * Launches a simple Swing-based GUI for the news reader.
+     */
+    public void launchGUI() {
+        javax.swing.SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                createAndShowGUI();
+            }
+        });
+    }
+
+    /**
+     * Creates and displays the GUI, which shows a list of news titles, details of the selected news,
+     * and provides a button to save articles to favorites.
+     */
+    private void createAndShowGUI() {
+        javax.swing.JFrame frame = new javax.swing.JFrame("News Reader");
+        frame.setDefaultCloseOperation(javax.swing.JFrame.DISPOSE_ON_CLOSE);
+        frame.setSize(800, 600);
+        frame.setLayout(new java.awt.BorderLayout());
+
+        // List model and JList for displaying news titles
+        javax.swing.DefaultListModel<String> listModel = new javax.swing.DefaultListModel<>();
+        for (News news : newsList) {
+            listModel.addElement(news.getTitle());
+        }
+        javax.swing.JList<String> newsJList = new javax.swing.JList<>(listModel);
+        javax.swing.JScrollPane listScrollPane = new javax.swing.JScrollPane(newsJList);
+        listScrollPane.setPreferredSize(new java.awt.Dimension(250, 600));
+        frame.add(listScrollPane, java.awt.BorderLayout.WEST);
+
+        // Text area to display selected news details
+        javax.swing.JTextArea newsDetails = new javax.swing.JTextArea();
+        newsDetails.setEditable(false);
+        frame.add(new javax.swing.JScrollPane(newsDetails), java.awt.BorderLayout.CENTER);
+
+        // Button to save the selected article to favorites
+        javax.swing.JButton favoriteButton = new javax.swing.JButton("Save to Favorites");
+        favoriteButton.addActionListener(e -> {
+            int selectedIndex = newsJList.getSelectedIndex();
+            if (selectedIndex != -1) {
+                News selectedNews = newsList.get(selectedIndex);
+                saveFavoriteArticle(selectedNews);
+                javax.swing.JOptionPane.showMessageDialog(frame, "Article saved to favorites!");
+            } else {
+                javax.swing.JOptionPane.showMessageDialog(frame, "Please select an article first.");
+            }
+        });
+
+        javax.swing.JPanel bottomPanel = new javax.swing.JPanel();
+        bottomPanel.add(favoriteButton);
+        frame.add(bottomPanel, java.awt.BorderLayout.SOUTH);
+
+        // When an article is selected, display its full details
+        newsJList.addListSelectionListener(e -> {
+            if (!e.getValueIsAdjusting()) {
+                int selectedIndex = newsJList.getSelectedIndex();
+                if (selectedIndex != -1) {
+                    News selectedNews = newsList.get(selectedIndex);
+                    StringBuilder details = new StringBuilder();
+                    details.append("Title: ").append(selectedNews.getTitle()).append("\n");
+                    details.append("Description: ").append(selectedNews.getDescription()).append("\n");
+                    details.append("Source: ").append(selectedNews.getSourceName()).append("\n");
+                    details.append("Author: ").append(selectedNews.getAuthor()).append("\n");
+                    details.append("URL: ").append(selectedNews.getUrl()).append("\n");
+                    details.append("Published At: ").append(selectedNews.getFormattedPublishedAt("yyyy-MM-dd HH:mm:ss")).append("\n");
+                    newsDetails.setText(details.toString());
+                }
+            }
+        });
+
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
 }
diff --git a/BreakingNews/src/main/java/AP/Main.java b/BreakingNews/src/main/java/AP/Main.java
index ae51d7d..0055959 100644
--- a/BreakingNews/src/main/java/AP/Main.java
+++ b/BreakingNews/src/main/java/AP/Main.java
@@ -1,7 +1,41 @@
 package AP;
 
+import java.util.Scanner;
+
 public class Main {
     public static void main(String[] args) {
+        Scanner scanner = new Scanner(System.in);
+        String apiKey = "c3456d6c9ce64e889f1001baca14059a"; // Use any available API keys.
+        Infrastructure infrastructure = new Infrastructure(apiKey);
+
+        while (true) {
+            System.out.println("\nNews Menu:");
+            System.out.println("1. View News List");
+            System.out.println("2. View Favorite Articles");
+            System.out.println("3. Launch GUI");
+            System.out.println("4. Exit");
+            System.out.print("Enter your choice: ");
+
+            int choice = scanner.nextInt();
+            scanner.nextLine(); // Consume newline
 
+            switch (choice) {
+                case 1:
+                    infrastructure.displayNewsList();
+                    break;
+                case 2:
+                    infrastructure.displayFavoriteArticles();
+                    break;
+                case 3:
+                    infrastructure.launchGUI();
+                    break;
+                case 4:
+                    System.out.println("Exiting...");
+                    scanner.close();
+                    System.exit(0);
+                default:
+                    System.out.println("Invalid choice. Please try again.");
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/BreakingNews/src/main/java/AP/News.java b/BreakingNews/src/main/java/AP/News.java
new file mode 100644
index 0000000..beb5cdd
--- /dev/null
+++ b/BreakingNews/src/main/java/AP/News.java
@@ -0,0 +1,69 @@
+package AP;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class News {
+    private String title;
+    private String description;
+    private String sourceName;
+    private String author;
+    private String url;
+    private Date publishedAt;
+
+    public News(String title, String description, String sourceName, String author, String url, Date publishedAt) {
+        this.title = title;
+        this.description = description;
+        this.sourceName = sourceName;
+        this.author = author;
+        this.url = url;
+        this.publishedAt = publishedAt;
+    }
+
+
+     // Displays all the details of this news article.
+    public void displayNews() {
+        System.out.println("Title: " + title);
+        System.out.println("Description: " + description);
+        System.out.println("Source: " + sourceName);
+        System.out.println("Author: " + author);
+        System.out.println("URL: " + url);
+        System.out.println("Published At: " + publishedAt);
+    }
+
+    /**
+     * Returns the publish date formatted with the given pattern.
+     *
+     * @param format e.g., "yyyy-MM-dd"
+     * @return formatted date string
+     */
+    public String getFormattedPublishedAt(String format) {
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        return sdf.format(publishedAt);
+    }
+
+    // Getters for use in the GUI and menus
+    public String getTitle() {
+        return title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public Date getPublishedAt() {
+        return publishedAt;
+    }
+}
diff --git a/Report.md b/Report.md
index d437803..0967eb1 100644
--- a/Report.md
+++ b/Report.md
@@ -1,62 +1,45 @@
 # Project Title
 
-Simple overview of use/purpose.
+This report outlines the tasks completed in implementing a Java-based News Aggregator using Gradle as a package manager. It also details the challenges encountered during development and their solutions.
 
-## Description
 
-An in-depth paragraph about your project and overview of use.
+## Description
 
+Our project is a Java-based News Aggregator that fetches current news articles from NewsAPI.org and displays them using both a console menu and a Swing-based GUI. It uses Gradle for dependency management, with the org.json library to parse the API's JSON responses. The application is organized into key classes: News encapsulates article details, Infrastructure handles API communication and data parsing, and Main provides a user-friendly interface for browsing, selecting, and saving articles as favorites.
 ## Getting Started
 
 ### Dependencies
 
-* Describe any prerequisites, libraries, OS version, etc., needed before installing program.
-* ex. Windows 10
+* JDK (version 11 or later).
+* Gradle package (Gradle Wrapper is recommmended.)
+* org.json Library
+* Java Swing
+* An internet connection for fetching news articles. 
 
 ### Installing
 
-* How/where to download your program
-* Any modifications needed to be made to files/folders
+* This project is available at https://github.com/Advanced-Programming-1403/Second-Assignment-BreakingNews
+* Gradle Wrapper:
+    If you do not have the wrapper files (gradlew/gradlew.bat), run gradle wrapper in the project root to generate them. This ensures consistent build behavior across different environments.
 
 ### Executing program
 
-* How to run the program
-* Step-by-step bullets
-```
-code blocks for commands
-```
+You can easily run the project using your IDE, or using these commands:
+1. Navigate to your project's root directory
+2. Run "./gradlew build" for MacOS/Linux, or "gradlew.bat build" for Windows.
+3. Run "./gradlew run" for MacOS/Linux, or "gradlew.bat run" for Windows.
+
 
 ## Help
 
-Any advise for common problems or issues.
-```
-command to run if program contains helper info
-```
+Make sure you've installed Gradle Wrapper (gradlew) and ensure JSON Library is in build.gradle.
+Check you internet connection or try to change your ip using any DNS or VPN.
 
 ## Authors
 
-Contributors names and contact info
-
-ex. Dominique Pizzie  
-ex. [@DomPizzie](https://twitter.com/dompizzie)
+Amirmohammad Gholami [@The_amirrzh](https://t.me/the_amirrzh)
 
 ## Version History
 
-* 0.2
-    * Various bug fixes and optimizations
-    * See [commit change]() or See [release history]()
 * 0.1
     * Initial Release
-
-## License
-
-This project is licensed under the [NAME HERE] License - see the LICENSE.md file for details
-
-## Acknowledgments
-
-Inspiration, code snippets, etc.
-* [awesome-readme](https://github.com/matiassingers/awesome-readme)
-* [PurpleBooth](https://gist.github.com/PurpleBooth/109311bb0361f32d87a2)
-* [dbader](https://github.com/dbader/readme-template)
-* [zenorocha](https://gist.github.com/zenorocha/4526327)
-* [fvcproductions](https://gist.github.com/fvcproductions/1bfc2d4aecb01a834b46)