More progress! Still not done. Getting absolutely slaughtered at work this week and it's playing happy havoc with my ability to write. But it'll get done tomorrow, maybe Friday at the latest.