Newbranch

@vymapson @sdcosta @malcolmmcc merging this to master