added clone class, rearranging stuff