Initial changes for cryptotarget (incomplete)