0.0.69.7

Phase 2 refractoring completed.