Merge from Emman

Preparing to dock with the mothership....