More parse changes, still need to work on procedure/function parsing