Boxes

Hi Yossof,

I'll merge this branch into my dev branch (workspace).

Ted