initial commit for gb branch pt2