merged data-new with front-end-derek branch and resolved conflicts