Feature/lessvars

The changes be coming.