Create events controller
Working timer that picks up where it left off on refresh
Fix merge conflicts and properly ignore source_maps directory in git