Added more timer stuff and stuff