Started adding entities system