Entities + Gameview trunk