Committing work-in-progress so I can continue on other devices.