more encampment logic
merging