getting dem walls working
Merge DS