Get clone halfway working for real