Working on refactoring move system.