Added listeners and updated TO-DO