#40 Revamping the crudr.state