added todos
Removed some project references with resharper, NOT Test.Unit and SiteSimulator since those caused issues.