Merge James and Olga tables.  Refer to notes for what needs adding