Interim commit after getting some data loading working.