New box redux

Summary:

Test Plan:

Reviewers:

CC:

Task ID: #

Blame Rev: