Add support for src/dest, some reverts..