initial multi-variable support.. need to add tests for this commit