Entity tracking

shape