squash! Working commit 7