start of work
refactor to be less ugly
Merge remote-tracking branch 'github/master' into project-string
Merge branch 'project-string' into aggregatemore