squash! Working commit 34