Added quit functionality, still buggy timer