FOOB-43 first

Commit 2 of squash