updated in response to project discussions
Merge branch 'journal-part-2'