Added all the TODO listeners.  Next step: testing