Intermediate commit - testing too-short move handling
Interim commit