updated w timer sort of
merged timer & chat