master branch progress 12
newf06
newf06-10