Moved all the box related calls together.

Preparing to move these calls to a new object.