Add IDs to allow easier linking

Alternative suggestion to #99 

@BenClancy, thoughts?