Newdb > Master

newdb branch ready for master