started testing the integration code, getting Eigen failures; fixing this tomorrow