game play stuff
merge avoid?
changes