feat(expand): square and full expansion