Very nearly completed reworking of thumbnail update + conventional cut
support.

Committing for safety reasons