adding assertion back
adding todo