Integrate into crypto classes, need to clean up now