break up long lines
break out add function
move function closer to for-loop
factor together organisation lookups