Added code for multivariate stuff, should be working