Did first code review to fix imports, and add remarks for further changes.
now tests have a chance to run
Getting even further ...