A bunch of WIP tweaks while I try to work out VAR output