adding initial class parsing