final v1 version. Class and Console app fixed