Move to seperate objects, files.  Change layout of how clones work