Even closer to fixing my cloning issues