Works for now, still some things to be done...