removed unneeded class and changed how timer works