Moving parts 1 and 2 to 'master' branch.

Copied over from 'local'.