first commit since ported over from VB.NET to C#