KD - refactored the way move works and added more tests