Pull Shawn's version of C# Solution

Pull to merge repos