VP-297: Very interim commit: Lots of stuff now working, don't want to lose it. Still lots more to do.