squash! Working commit 18