Moving commit, workin on th efunc parsing - to simplify it and solve once for all