Added event listening and dogs (mostly)