updated parser methods
Basic parser method complete