Add box entity
Make the concept of 'entities'. Lots of whitespace changes.