add parser / move some stuff into img...