working on timer
merged changes, continuing with the countdown timer