WIP on eto, resharper improvements.