Work in progress

Checking in since I need to clean up stylecop.
Added some comments

So I don't forget how the data is stored.
Old not needed.