Add cv attribute
Cleanup save
Revert improper conditionals
Too deep