Move some code into Box calss