HV-709

Still need to add tests and accomodate for the latest changes discussed on the ML (removing bean/cross-parameter nodes) but I'm still creating this PR to get early feedback.