refactored names
wip
wip
changed segment structure such that top level structure is strings and comments
children will be the numbers, keywords
Merge branch 'temp'