Toward a simultaneous description of RAA and v2 for heavy quarks. (January 2016)