Initial work on the cloner (#2)