Finished some listeners and managers