Getting a private branch on main repo

Merging my branch into voldemort/venice branch.