Moved changes around for better organization and made timer easier to edit.