Refactor tellType method. Implement checking dates #9