More class parsing work, extremely dirty for now