Still removing stuff
HandlerRepo is now generic for ICommand and IListener