Changes

Started changes per last convo on BG site.