All woring, still some tweaks needed, he addition does not work...