#192, #125, #17, ongoing interim commit finalizing data