Start streamlining core/parser