many movement changes...partial refactor of unit removal...