TODO: - Cleanup and split the timer function Upon Unstaging: - Updated MAINTAINERS