added functional and data reqs
fixed merge
fixed more merge