rename to match controller
rename variables
use enter exit, fix listener soruce