Parser continued, added 2 new classes, empty so far