Intermediate commit.  Filling out new variable handler framework.