Parser shoulb now be contained in classes