Lots of fixes to make this work for the odd19 site as a test case