added todos during code review and looked at what resharper and ncrunch had to say if anything.