Major areas should be in place, more work is needed with invariants.