start of work
refactor to be less ugly
Merge branch 'project-string' into mapreduce