Late night changes

All initial 'contains' booleans must return true to be acceptable.