first phase finished....all changes in main are still untested!