Sorry, I forget this is a common C# convention. I am probably missing braces for many one liners, I'll do a pass to fix this up across all the code I added.