diff --git a/jcshepherd63.Calculator/.gitattributes b/jcshepherd63.Calculator/.gitattributes
new file mode 100644
index 00000000..1ff0c423
--- /dev/null
+++ b/jcshepherd63.Calculator/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln merge=binary
+#*.csproj merge=binary
+#*.vbproj merge=binary
+#*.vcxproj merge=binary
+#*.vcproj merge=binary
+#*.dbproj merge=binary
+#*.fsproj merge=binary
+#*.lsproj merge=binary
+#*.wixproj merge=binary
+#*.modelproj merge=binary
+#*.sqlproj merge=binary
+#*.wwaproj merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg binary
+#*.png binary
+#*.gif binary
+
+###############################################################################
+# diff behavior for common document formats
+#
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the
+# entries below.
+###############################################################################
+#*.doc diff=astextplain
+#*.DOC diff=astextplain
+#*.docx diff=astextplain
+#*.DOCX diff=astextplain
+#*.dot diff=astextplain
+#*.DOT diff=astextplain
+#*.pdf diff=astextplain
+#*.PDF diff=astextplain
+#*.rtf diff=astextplain
+#*.RTF diff=astextplain
diff --git a/jcshepherd63.Calculator/.gitignore b/jcshepherd63.Calculator/.gitignore
new file mode 100644
index 00000000..9491a2fd
--- /dev/null
+++ b/jcshepherd63.Calculator/.gitignore
@@ -0,0 +1,363 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Oo]ut/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
\ No newline at end of file
diff --git a/jcshepherd63.Calculator/Calculator.slnx b/jcshepherd63.Calculator/Calculator.slnx
new file mode 100644
index 00000000..b5f75364
--- /dev/null
+++ b/jcshepherd63.Calculator/Calculator.slnx
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/jcshepherd63.Calculator/Calculator/Calculator.csproj b/jcshepherd63.Calculator/Calculator/Calculator.csproj
new file mode 100644
index 00000000..8acb7da5
--- /dev/null
+++ b/jcshepherd63.Calculator/Calculator/Calculator.csproj
@@ -0,0 +1,14 @@
+
+
+
+ Exe
+ net10.0
+ enable
+ enable
+
+
+
+
+
+
+
diff --git a/jcshepherd63.Calculator/Calculator/Program.cs b/jcshepherd63.Calculator/Calculator/Program.cs
new file mode 100644
index 00000000..f2b74287
--- /dev/null
+++ b/jcshepherd63.Calculator/Calculator/Program.cs
@@ -0,0 +1,141 @@
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+using CalculatorLibrary;
+
+class Program
+{
+ static void Main(string[] args)
+ {
+ bool endApp = false;
+ int calculationCount = 0;
+ List previousCalculations = new();
+ double ans = 0;
+ Console.WriteLine("Console Calculator in C#\r");
+ Console.WriteLine("-------------------------\n");
+
+ Calculator calculator = new();
+ while (!endApp)
+ {
+ string? numInput1 = "";
+ string? numInput2 = "";
+ double result = 0;
+
+ if(calculationCount > 0)
+ {
+ Console.Write("Would you like to view past calculations? (Y/N): ");
+ string? pastCalcRead = Console.ReadLine().ToLower().Trim();
+ if(pastCalcRead == "y")
+ {
+ foreach(string calc in previousCalculations)
+ {
+ Console.WriteLine(calc);
+ }
+ Console.WriteLine("Press any key to continue.");
+ Console.ReadLine();
+ Console.Clear();
+ }
+ else
+ {
+ Console.Clear();
+ }
+ }
+
+ Console.Write("Type a number or 'Ans' (to use the result from the last calculation), and then press enter: ");
+ numInput1 = Console.ReadLine();
+
+ double cleanNum1 = 0;
+ if (numInput1.ToLower().Trim() == "ans")
+ {
+ cleanNum1 = ans;
+ }
+ else
+ {
+ while (!double.TryParse(numInput1, out cleanNum1))
+ {
+ Console.WriteLine("This is not a valid input. Please enter a number.");
+ numInput1 = Console.ReadLine();
+ }
+ }
+
+ Console.Write("Type a number or 'Ans' (to use the result from the last calculation), and then press enter: ");
+ numInput2 = Console.ReadLine();
+
+ double cleanNum2 = 0;
+
+ if (numInput2.ToLower().Trim() == "ans")
+ {
+ cleanNum2 = ans;
+ }
+ else
+ {
+ while (!double.TryParse(numInput2, out cleanNum2))
+ {
+ Console.WriteLine("This is not a valid input. Please enter a number or 'Ans'.");
+ numInput2 = Console.ReadLine();
+ }
+ }
+
+ Console.WriteLine("Choose an operator from the list below: \n -------------------------------------------");
+ Console.WriteLine("\tA - Add");
+ Console.WriteLine("\tS - Subtract");
+ Console.WriteLine("\tM - Multiply");
+ Console.WriteLine("\tD - Divide");
+ Console.Write("Choose one and press enter: ");
+
+ string? op = Console.ReadLine().ToLower().Trim();
+ if (op == null || ! Regex.IsMatch(op, "[a|s|m|d]"))
+ {
+ Console.WriteLine("Error: Unrecognized Input.");
+ }
+ else
+ {
+ try
+ {
+ result = calculator.DoOperation(cleanNum1, cleanNum2, op);
+ ans = result;
+ if (double.IsNaN(result))
+ {
+ Console.WriteLine("This will result in a mathematical error. \n");
+ }
+ else
+ {
+ Console.WriteLine($"Your result: {result}");
+ calculationCount++;
+ switch (op)
+ {
+ case "a":
+ previousCalculations.Add($"{cleanNum1} + {cleanNum2} = {result}");
+ break;
+ case "s":
+ previousCalculations.Add($"{cleanNum1} - {cleanNum2} = {result}");
+ break;
+ case "m":
+ previousCalculations.Add($"{cleanNum1} * {cleanNum2} = {result}");
+ break;
+ case "d":
+ previousCalculations.Add($"{cleanNum1} / {cleanNum2} = {result}");
+ break;
+ }
+ Console.WriteLine($"You have used the calculator {calculationCount} times in this session.");
+ }
+ }
+ catch(Exception e)
+ {
+ Console.WriteLine("An error occured while trying to process this operation.");
+ }
+ }
+ Console.WriteLine("------------------------------------------------\n");
+
+ Console.WriteLine("Type 'End' then Enter to close the app or press any other key and Enter to continue.");
+ if(Console.ReadLine().ToLower().Trim() == "end")
+ {
+ endApp = true;
+ }
+ Console.WriteLine("\n");
+ }
+ calculator.Finish();
+ return;
+ }
+}
+
+//Merged with branch to complete part 1.
\ No newline at end of file
diff --git a/jcshepherd63.Calculator/CalculatorLibrary/CalculatorLibrary.csproj b/jcshepherd63.Calculator/CalculatorLibrary/CalculatorLibrary.csproj
new file mode 100644
index 00000000..22badd14
--- /dev/null
+++ b/jcshepherd63.Calculator/CalculatorLibrary/CalculatorLibrary.csproj
@@ -0,0 +1,13 @@
+
+
+
+ net10.0
+ enable
+ enable
+
+
+
+
+
+
+
diff --git a/jcshepherd63.Calculator/CalculatorLibrary/CalculatoryLibrary.cs b/jcshepherd63.Calculator/CalculatorLibrary/CalculatoryLibrary.cs
new file mode 100644
index 00000000..79219379
--- /dev/null
+++ b/jcshepherd63.Calculator/CalculatorLibrary/CalculatoryLibrary.cs
@@ -0,0 +1,71 @@
+using System.Diagnostics;
+using Newtonsoft.Json;
+
+namespace CalculatorLibrary
+{
+ public class Calculator
+ {
+
+ JsonWriter writer;
+ public Calculator()
+ {
+ StreamWriter logFile = File.CreateText("calculatorlog.json");
+ logFile.AutoFlush = true;
+ writer = new JsonTextWriter(logFile);
+ writer.Formatting = Formatting.Indented;
+ writer.WriteStartObject();
+ writer.WritePropertyName("Operations");
+ writer.WriteStartArray();
+ }
+
+ public double DoOperation(double num1, double num2, string op)
+ {
+ double result = double.NaN;
+ writer.WriteStartObject();
+ writer.WritePropertyName("Operand1");
+ writer.WriteValue(num1);
+ writer.WritePropertyName("Operand2");
+ writer.WriteValue(num2);
+ writer.WritePropertyName("Operation");
+
+ switch (op)
+ {
+ case "a":
+ result = num1 + num2;
+ writer.WriteValue("Add");
+ break;
+ case "s":
+ result = num1 - num2;
+ writer.WriteValue("Subtract");
+ break;
+ case "m":
+ result = num1 * num2;
+ writer.WriteValue("Multiply");
+ break;
+ case "d":
+ if (num2 != 0)
+ {
+ result = num1 / num2;
+ writer.WriteValue("Divide");
+ }
+ break;
+ default:
+ break;
+ }
+ writer.WritePropertyName("Result");
+ writer.WriteValue(result);
+ writer.WriteEndObject();
+
+
+ return result;
+ }
+
+ public void Finish()
+ {
+ writer.WriteEndArray();
+ writer.WriteEndObject();
+ writer.Close();
+ }
+ }
+
+}