Added Listeners, added Commands