[@Zeroth]

I should be able to finish up tomorrow, Monday at the latest