Michails changes
Combine changes
Rest of Michails changes
Commit working version test with all changes
Changes made in Friday test

All directories running clean