major commit with first version of DEx parsing