Half-way implementation of listenable
Missing listenable file
all around fixes