Small Changes
Some of the layered URL options weren't working, now fixed
Added a test for the data-vars on the container
Changed some variable names to avoid collisions