renamed fields for repurposing (issue 2)
Merge branch 'issue-2' into merged
resolved some conflicts with schema change
Merge branch 'issue-2' into merged
removed unnecessary uniqueness constraint
Merge branch 'issue-2' into merged
index on merged: ceffd67 Merge branch 'issue-2' into merged
WIP on merged: ceffd67 Merge branch 'issue-2' into merged