More 2.2
Fixed marriage
Beginning of assertions
Assertions done
Refactored assertions
Defensive done
Fixed lazy init
Minor fix
Logging done
Test done
Minor changes