index on HEAD: 298df34 latest
WIP on HEAD: 298df34 latest
some improment with variable naming
improved variable handling and helper functions