Adding validation and hotter/colder logic