Working on the listener and models.