Shifted most classes over to C#