add initial parsing