Broke stuff. Moved parser around a bit