almost done -- timer remove does not work yet