foo
undo foo
cleaned up a few things, got variable branch working