fat refactoring for kevscript, not working for now, but Im scared to lost everything :D => push