Part almost done
Merge remote-tracking branch 'origin'
Part almost done