WIP - bug with initial directory copy after clone