refactor, message re: whether its over