Feature/multivariate learning

Fix it before it goes in develop.